Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 4 Jul 2011 03:22:04 +0000 (20:22 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 4 Jul 2011 03:22:04 +0000 (20:22 -0700)

Trivial merge